Merge branch 'transparent-windows'
authorAlexander Larsson <alexl@redhat.com>
Mon, 5 Dec 2011 13:24:28 +0000 (14:24 +0100)
committerAlexander Larsson <alexl@redhat.com>
Mon, 5 Dec 2011 13:24:28 +0000 (14:24 +0100)

Trivial merge